Sync prebuilts with oc-mr1-dev. am: b144042b9e Change-Id: Idc8def284163b06d421548531fbf453381c4c599